diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index c8f3f51..b49dfdf 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -41,391 +41,457 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rpm-maven-plugin</artifactId>
-        <version>2.0.1</version>
-        <configuration>
-          <group>Development</group>
-          <needarch>x86_64</needarch>
-          <copyright>2012, Apache Software Foundation</copyright>
-          <version>${package-version}</version>
-          <release>${package-release}</release>
-
-          <defaultFilemode>644</defaultFilemode>
-          <defaultDirmode>755</defaultDirmode>
-          <defaultUsername>root</defaultUsername>
-          <defaultGroupname>root</defaultGroupname>
-        </configuration>
+        <artifactId>maven-assembly-plugin</artifactId>
         <executions>
-          <!--ambari-metrics-monitor-->
           <execution>
-            <id>ambari-metrics-monitor</id>
-            <!-- unbinds rpm creation from maven lifecycle -->
+            <id>collector</id>
             <phase>package</phase>
             <goals>
-              <goal>rpm</goal>
+              <goal>single</goal>
             </goals>
             <configuration>
-              <name>ambari-metrics-monitor</name>
-              <group>Development</group>
-              <needarch>x86_64</needarch>
-              <autoRequires>false</autoRequires>
-              <requires>
-                <require>ambari-metrics-hadoop-sink</require>
-                <require>ambari-metrics-flume-sink</require>
-                <require>${python.ver}</require>
-                <require>gcc</require>
-                <require>python-devel</require>
-              </requires>
-              <preremoveScriptlet>
-                <scriptFile>src/main/package/rpm/preremove.sh</scriptFile>
-                <fileEncoding>utf-8</fileEncoding>
-              </preremoveScriptlet>
-              <mappings>
-                <mapping>
-                  <directory>${resmonitor.install.dir}</directory>
-                  <username>root</username>
-                  <groupname>root</groupname>
-                  <sources>
-                    <source>
-                      <location>
-                        ${monitor.dir}/src/main/python/__init__.py
-                      </location>
-                    </source>
-                    <source>
-                      <location>
-                        ${monitor.dir}/src/main/python/main.py
-                      </location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${resmonitor.install.dir}/core</directory>
-                  <sources>
-                    <source>
-                      <location>
-                        ${monitor.dir}/src/main/python/core
-                      </location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${resmonitor.install.dir}/psutil</directory>
-                  <sources>
-                    <source>
-                      <location>
-                        ${monitor.dir}/src/main/python/psutil
-                      </location>
-                      <excludes>
-                        <exclude>build/**</exclude>
-                        <exclude>build/*</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/etc/ambari-metrics-monitor/conf</directory>
-                  <configuration>true</configuration>
-                </mapping>
-                <mapping>
-                  <directory>/var/run/ambari-metrics-monitor</directory>
-                </mapping>
-                <mapping>
-                  <directory>/var/log/ambari-metrics-monitor</directory>
-                </mapping>
-                <mapping>
-                  <directory>/usr/sbin</directory>
-                  <filemode>755</filemode>
-                  <username>root</username>
-                  <groupname>root</groupname>
-                  <directoryIncluded>false</directoryIncluded>
-                  <sources>
-                    <source>
-                      <location>
-                        ${monitor.dir}/conf/unix/ambari-metrics-monitor
-                      </location>
-                      <filter>true</filter>
-                    </source>
-                  </sources>
-                </mapping>
-              </mappings>
+              <attach>false</attach>
+              <finalName>ambari-metrics-collector-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>src/main/assembly/collector.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
           </execution>
-
-          <!--ambari-metrics-collector-->
           <execution>
-            <id>ambari-metrics-collector</id>
+            <id>monitor</id>
             <phase>package</phase>
             <goals>
-              <goal>rpm</goal>
+              <goal>single</goal>
             </goals>
             <configuration>
-              <name>ambari-metrics-collector</name>
-              <copyright>2012, Apache Software Foundation</copyright>
-              <group>Development</group>
-              <description>Maven Recipe: RPM Package.</description>
-              <autoRequires>false</autoRequires>
-              <requires>
-                <require>${python.ver}</require>
-              </requires>
-
-              <defaultFilemode>644</defaultFilemode>
-              <defaultDirmode>755</defaultDirmode>
-              <defaultUsername>root</defaultUsername>
-              <defaultGroupname>root</defaultGroupname>
-
-              <mappings>
-                <mapping>
-                  <!--jars-->
-                  <directory>/usr/lib/ambari-metrics-collector/</directory>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/target/lib</location>
-                    </source>
-                    <source>
-                      <location>
-                        ${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
-                      </location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <!--embedded applications-->
-                  <directory>/usr/lib/ams-hbase/</directory>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/target/embedded/${hbase.folder}</location>
-                      <excludes>
-                        <exclude>bin/**</exclude>
-                        <exclude>bin/*</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/usr/lib/ams-hbase/bin</directory>
-                  <filemode>755</filemode>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/target/embedded/${hbase.folder}/bin</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/usr/lib/ams-hbase/lib/</directory>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/target/lib</location>
-                      <includes>
-                        <include>phoenix*.jar</include>
-                        <include>antlr*.jar</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/usr/sbin</directory>
-                  <filemode>755</filemode>
-                  <username>root</username>
-                  <groupname>root</groupname>
-                  <directoryIncluded>false</directoryIncluded>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/conf/unix/ambari-metrics-collector</location>
-                      <filter>false</filter>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/etc/ambari-metrics-collector/conf</directory>
-                  <configuration>true</configuration>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/conf/unix/ams-env.sh</location>
-                    </source>
-                    <source>
-                      <location>${collector.dir}/conf/unix/ams-site.xml</location>
-                    </source>
-                    <source>
-                      <location>${collector.dir}/conf/unix/log4j.properties</location>
-                    </source>
-                    <source>
-                      <location>${collector.dir}/target/embedded/${hbase.folder}/conf/hbase-site.xml</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/etc/ams-hbase/conf</directory>
-                  <configuration>true</configuration>
-                  <sources>
-                    <source>
-                      <location>${collector.dir}/target/embedded/${hbase.folder}/conf</location>
-                      <includes>
-                        <include>*.*</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>/var/run/ams-hbase</directory>
-                </mapping>
-                <mapping>
-                  <directory>/var/run/ambari-metrics-collector</directory>
-                </mapping>
-                <mapping>
-                  <directory>/var/log/ambari-metrics-collector</directory>
-                </mapping>
-                <mapping>
-                  <directory>/var/lib/ambari-metrics-collector</directory>
-                </mapping>
-              </mappings>
+              <attach>false</attach>
+              <finalName>ambari-metrics-monitor-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>src/main/assembly/monitor.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
           </execution>
-
-          <!--hadoop-sink-->
           <execution>
-            <id>ambari-metrics-hadoop-sink</id>
+            <id>hadoop-sink</id>
             <phase>package</phase>
             <goals>
-              <goal>rpm</goal>
+              <goal>single</goal>
             </goals>
+            <configuration>
+              <attach>false</attach>
+              <finalName>ambari-metrics-hadoop-sink-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>src/main/assembly/sink.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <profiles>
+    <profile>
+      <id>rpm</id>
 
+      <activation>
+        <property>
+          <name>build-rpm</name>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rpm-maven-plugin</artifactId>
+            <version>2.0.1</version>
             <configuration>
-              <name>ambari-metrics-hadoop-sink</name>
-              <copyright>2012, Apache Software Foundation</copyright>
               <group>Development</group>
-              <description>Maven Recipe: RPM Package.</description>
+              <needarch>x86_64</needarch>
+              <copyright>2012, Apache Software Foundation</copyright>
+              <version>${package-version}</version>
+              <release>${package-release}</release>
 
-              <defaultDirmode>755</defaultDirmode>
               <defaultFilemode>644</defaultFilemode>
+              <defaultDirmode>755</defaultDirmode>
               <defaultUsername>root</defaultUsername>
               <defaultGroupname>root</defaultGroupname>
+            </configuration>
+            <executions>
+              <!--ambari-metrics-monitor-->
+              <execution>
+                <id>ambari-metrics-monitor</id>
+                <!-- unbinds rpm creation from maven lifecycle -->
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <configuration>
+                  <name>ambari-metrics-monitor</name>
+                  <group>Development</group>
+                  <needarch>x86_64</needarch>
+                  <autoRequires>false</autoRequires>
+                  <requires>
+                    <require>ambari-metrics-hadoop-sink</require>
+                    <require>ambari-metrics-flume-sink</require>
+                    <require>${python.ver}</require>
+                    <require>gcc</require>
+                    <require>python-devel</require>
+                  </requires>
+                  <preremoveScriptlet>
+                    <scriptFile>src/main/package/rpm/preremove.sh</scriptFile>
+                    <fileEncoding>utf-8</fileEncoding>
+                  </preremoveScriptlet>
+                  <mappings>
+                    <mapping>
+                      <directory>${resmonitor.install.dir}</directory>
+                      <username>root</username>
+                      <groupname>root</groupname>
+                      <sources>
+                        <source>
+                          <location>
+                            ${monitor.dir}/src/main/python/__init__.py
+                          </location>
+                        </source>
+                        <source>
+                          <location>
+                            ${monitor.dir}/src/main/python/main.py
+                          </location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>${resmonitor.install.dir}/core</directory>
+                      <sources>
+                        <source>
+                          <location>
+                            ${monitor.dir}/src/main/python/core
+                          </location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>${resmonitor.install.dir}/psutil</directory>
+                      <sources>
+                        <source>
+                          <location>
+                            ${monitor.dir}/src/main/python/psutil
+                          </location>
+                          <excludes>
+                            <exclude>build/**</exclude>
+                            <exclude>build/*</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/etc/ambari-metrics-monitor/conf</directory>
+                      <configuration>true</configuration>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/run/ambari-metrics-monitor</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/log/ambari-metrics-monitor</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/sbin</directory>
+                      <filemode>755</filemode>
+                      <username>root</username>
+                      <groupname>root</groupname>
+                      <directoryIncluded>false</directoryIncluded>
+                      <sources>
+                        <source>
+                          <location>
+                            ${monitor.dir}/conf/unix/ambari-metrics-monitor
+                          </location>
+                          <filter>true</filter>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
 
-              <postinstallScriptlet>
-                <scriptFile>${hadoop-sink.dir}/target/rpm/postinstall.sh</scriptFile>
-                <fileEncoding>utf-8</fileEncoding>
-              </postinstallScriptlet>
+              <!--ambari-metrics-collector-->
+              <execution>
+                <id>ambari-metrics-collector</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <configuration>
+                  <name>ambari-metrics-collector</name>
+                  <copyright>2012, Apache Software Foundation</copyright>
+                  <group>Development</group>
+                  <description>Maven Recipe: RPM Package.</description>
+                  <autoRequires>false</autoRequires>
+                  <requires>
+                    <require>${python.ver}</require>
+                  </requires>
 
-              <mappings>
-                <mapping>
-                  <directory>/usr/lib/ambari-metrics-hadoop-sink</directory>
-                  <sources>
-                    <source>
-                      <location>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</location>
-                    </source>
-                  </sources>
+                  <defaultFilemode>644</defaultFilemode>
+                  <defaultDirmode>755</defaultDirmode>
+                  <defaultUsername>root</defaultUsername>
+                  <defaultGroupname>root</defaultGroupname>
 
-                </mapping>
+                  <mappings>
+                    <mapping>
+                      <!--jars-->
+                      <directory>/usr/lib/ambari-metrics-collector/</directory>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/lib</location>
+                        </source>
+                        <source>
+                          <location>
+                            ${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
+                          </location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <!--embedded applications-->
+                      <directory>/usr/lib/ams-hbase/</directory>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}</location>
+                          <excludes>
+                            <exclude>bin/**</exclude>
+                            <exclude>bin/*</exclude>
+                          </excludes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ams-hbase/bin</directory>
+                      <filemode>755</filemode>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}/bin</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/lib/ams-hbase/lib/</directory>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/lib</location>
+                          <includes>
+                            <include>phoenix*.jar</include>
+                            <include>antlr*.jar</include>
+                          </includes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/usr/sbin</directory>
+                      <filemode>755</filemode>
+                      <username>root</username>
+                      <groupname>root</groupname>
+                      <directoryIncluded>false</directoryIncluded>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/conf/unix/ambari-metrics-collector</location>
+                          <filter>false</filter>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/etc/ambari-metrics-collector/conf</directory>
+                      <configuration>true</configuration>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/conf/unix/ams-env.sh</location>
+                        </source>
+                        <source>
+                          <location>${collector.dir}/conf/unix/ams-site.xml</location>
+                        </source>
+                        <source>
+                          <location>${collector.dir}/conf/unix/log4j.properties</location>
+                        </source>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}/conf/hbase-site.xml</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/etc/ams-hbase/conf</directory>
+                      <configuration>true</configuration>
+                      <sources>
+                        <source>
+                          <location>${collector.dir}/target/embedded/${hbase.folder}/conf</location>
+                          <includes>
+                            <include>*.*</include>
+                          </includes>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/run/ams-hbase</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/run/ambari-metrics-collector</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/log/ambari-metrics-collector</directory>
+                    </mapping>
+                    <mapping>
+                      <directory>/var/lib/ambari-metrics-collector</directory>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
 
-              </mappings>
-            </configuration>
+              <!--hadoop-sink-->
+              <execution>
+                <id>ambari-metrics-hadoop-sink</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
 
-          </execution>
+                <configuration>
+                  <name>ambari-metrics-hadoop-sink</name>
+                  <copyright>2012, Apache Software Foundation</copyright>
+                  <group>Development</group>
+                  <description>Maven Recipe: RPM Package.</description>
 
-          <!-- flume-sink -->
-          <execution>
-            <id>ambari-metrics-flume-sink</id>
-            <phase>package</phase>
-            <goals>
-              <goal>rpm</goal>
-            </goals>
-            <configuration>
-              <name>ambari-metrics-flume-sink</name>
-              <copyright>2012, Apache Software Foundation</copyright>
-              <group>Development</group>
-              <description>Maven Recipe: RPM Package.</description>
-              <mappings>
-                <mapping>
-                  <directory>/usr/lib/flume/lib</directory>
-                  <filemode>644</filemode>
-                  <username>root</username>
-                  <groupname>root</groupname>
-                  <sources>
-                    <source>
-                      <location>${flume-sink.dir}/target/ambari-metrics-flume-sink-${project.version}.jar</location>
-                    </source>
-                    <source>
-                      <location>${flume-sink.dir}/target/lib</location>
-                    </source>
-                  </sources>
-                </mapping>
-              </mappings>
-            </configuration>
-          </execution>
+                  <defaultDirmode>755</defaultDirmode>
+                  <defaultFilemode>644</defaultFilemode>
+                  <defaultUsername>root</defaultUsername>
+                  <defaultGroupname>root</defaultGroupname>
 
-          <!-- storm-sink -->
-          <execution>
-            <id>ambari-metrics-storm-sink</id>
-            <phase>package</phase>
-            <goals>
-              <goal>rpm</goal>
-            </goals>
+                  <postinstallScriptlet>
+                    <scriptFile>${hadoop-sink.dir}/target/rpm/postinstall.sh</scriptFile>
+                    <fileEncoding>utf-8</fileEncoding>
+                  </postinstallScriptlet>
 
-            <configuration>
-            <name>ambari-metrics-storm-sink</name>
-            <copyright>2012, Apache Software Foundation</copyright>
-            <group>Development</group>
-            <description>Maven Recipe: RPM Package.</description>
-            <defaultDirmode>755</defaultDirmode>
-            <defaultFilemode>644</defaultFilemode>
-            <defaultUsername>root</defaultUsername>
-            <defaultGroupname>root</defaultGroupname>
-            <mappings>
-              <mapping>
-                <directory>/usr/lib/storm/lib</directory>
-                <sources>
-                  <source>
-                    <location>${storm-sink.dir}/target/ambari-metrics-storm-sink-${project.version}.jar</location>
-                  </source>
-                  <source>
-                    <location>${storm-sink.dir}/target/lib</location>
-                  </source>
-                </sources>
-              </mapping>
-            </mappings>
-            </configuration>
-          </execution>
+                  <mappings>
+                    <mapping>
+                      <directory>/usr/lib/ambari-metrics-hadoop-sink</directory>
+                      <sources>
+                        <source>
+                          <location>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</location>
+                        </source>
+                      </sources>
 
+                    </mapping>
 
+                  </mappings>
+                </configuration>
 
-        </executions>
+              </execution>
 
+              <!-- flume-sink -->
+              <execution>
+                <id>ambari-metrics-flume-sink</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <configuration>
+                  <name>ambari-metrics-flume-sink</name>
+                  <copyright>2012, Apache Software Foundation</copyright>
+                  <group>Development</group>
+                  <description>Maven Recipe: RPM Package.</description>
+                  <mappings>
+                    <mapping>
+                      <directory>/usr/lib/flume/lib</directory>
+                      <filemode>644</filemode>
+                      <username>root</username>
+                      <groupname>root</groupname>
+                      <sources>
+                        <source>
+                          <location>${flume-sink.dir}/target/ambari-metrics-flume-sink-${project.version}.jar</location>
+                        </source>
+                        <source>
+                          <location>${flume-sink.dir}/target/lib</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
 
-      </plugin>
-    </plugins>
-  </build>
+              <!-- storm-sink -->
+              <execution>
+                <id>ambari-metrics-storm-sink</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
 
+                <configuration>
+                  <name>ambari-metrics-storm-sink</name>
+                  <copyright>2012, Apache Software Foundation</copyright>
+                  <group>Development</group>
+                  <description>Maven Recipe: RPM Package.</description>
+                  <defaultDirmode>755</defaultDirmode>
+                  <defaultFilemode>644</defaultFilemode>
+                  <defaultUsername>root</defaultUsername>
+                  <defaultGroupname>root</defaultGroupname>
+                  <mappings>
+                    <mapping>
+                      <directory>/usr/lib/storm/lib</directory>
+                      <sources>
+                        <source>
+                          <location>${storm-sink.dir}/target/ambari-metrics-storm-sink-${project.version}.jar</location>
+                        </source>
+                        <source>
+                          <location>${storm-sink.dir}/target/lib</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
 
 
 
+            </executions>
+
+
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+
   <dependencies>
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-metrics-timelineservice</artifactId>
       <version>${project.version}</version>
-      <type>pom</type>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-metrics-common</artifactId>
       <version>${project.version}</version>
-      <type>pom</type>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-metrics-hadoop-sink</artifactId>
       <version>${project.version}</version>
-      <type>pom</type>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-metrics-flume-sink</artifactId>
       <version>${project.version}</version>
-      <type>pom</type>
-      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-metrics-storm-sink</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
new file mode 100644
index 0000000..21c8e47
--- /dev/null
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <id>collector</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>${collector.dir}/target/embedded/${hbase.folder}</directory>
+      <outputDirectory>hbase</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${collector.dir}/conf/unix</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>ambari-metrics-collector</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${collector.dir}/conf/unix</directory>
+      <outputDirectory>conf</outputDirectory>
+      <includes>
+        <include>ams-env.sh</include>
+        <include>ams-site.xml</include>
+        <include>log4j.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${collector.dir}/target/lib</directory>
+      <outputDirectory>lib</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+      <unpack>false</unpack>
+      <outputDirectory>hbase/lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <includes>
+        <include>org.antlr:antlr*</include>
+        <include>org.apache.phoenix:phoenix-core</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <unpack>false</unpack>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <includes>
+        <include>org.apache.ambari:ambari-metrics-timelineservice</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+
+</assembly>
\ No newline at end of file
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml
new file mode 100644
index 0000000..370ce08
--- /dev/null
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/monitor.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <id>monitor</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>${monitor.dir}/src/main/python</directory>
+      <outputDirectory>site-packages/resource_monitoring</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>conf</outputDirectory>
+      <directory>${monitor.dir}/conf/unix</directory>
+      <excludes>
+        <exclude>*.*</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${monitor.dir}/conf/unix</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>ambari-metrics-monitor</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+
+
+
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+
+
+
+
+</assembly>
\ No newline at end of file
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
new file mode 100644
index 0000000..096c696
--- /dev/null
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <id>hadoop-sink</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+  </formats>
+
+  <fileSets>
+    <fileSet>
+      <directory>${hadoop-sink.dir}/src/main/conf</directory>
+      <outputDirectory>hadoop-sink/conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${flume-sink.dir}/src/main/conf</directory>
+      <outputDirectory>flume-sink/conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${storm-sink.dir}/src/main/conf</directory>
+      <outputDirectory>storm-sink/conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${flume-sink.dir}/target/lib</directory>
+      <outputDirectory>flume-sink/lib</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${storm-sink.dir}/target/lib</directory>
+      <outputDirectory>storm-sink/lib</outputDirectory>
+    </fileSet>
+
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</source>
+      <outputDirectory>hadoop-sink</outputDirectory>
+    </file>
+  </files>
+
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>flume-sink</outputDirectory>
+      <includes>
+        <include>org.apache.ambari:ambari-metrics-flume-sink</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>storm-sink</outputDirectory>
+      <includes>
+        <include>org.apache.ambari:ambari-metrics-storm-sink</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+
+
+
+
+</assembly>
\ No newline at end of file
diff --git a/ambari-metrics/ambari-metrics-flume-sink/pom.xml b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
index 3bb5d91..ac5390e 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/pom.xml
@@ -104,41 +104,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>rpm-maven-plugin</artifactId>-->
-        <!--<version>2.0.1</version>-->
-        <!--<executions>-->
-          <!--<execution>-->
-            <!--<phase>none</phase>-->
-            <!--<goals>-->
-              <!--<goal>rpm</goal>-->
-            <!--</goals>-->
-          <!--</execution>-->
-        <!--</executions>-->
-        <!--<configuration>-->
-          <!--<name>ambari-metrics-flume-sink</name>-->
-          <!--<copyright>2012, Apache Software Foundation</copyright>-->
-          <!--<group>Development</group>-->
-          <!--<description>Maven Recipe: RPM Package.</description>-->
-          <!--<mappings>-->
-            <!--<mapping>-->
-              <!--<directory>/usr/lib/flume/lib</directory>-->
-              <!--<filemode>644</filemode>-->
-              <!--<username>root</username>-->
-              <!--<groupname>root</groupname>-->
-              <!--<sources>-->
-                <!--<source>-->
-                  <!--<location>target/${project.artifactId}-${project.version}.jar</location>-->
-                <!--</source>-->
-                <!--<source>-->
-                  <!--<location>target/lib</location>-->
-                <!--</source>-->
-              <!--</sources>-->
-            <!--</mapping>-->
-          <!--</mappings>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
     </plugins>
   </build>
   <dependencies>
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
index c5cc2e9..e061bb3 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/pom.xml
@@ -58,6 +58,7 @@ limitations under the License.
               <descriptors>
                 <descriptor>src/main/assemblies/sink-jar.xml</descriptor>
               </descriptors>
+              <attach>false</attach>
               <tarLongFileMode>gnu</tarLongFileMode>
               <appendAssemblyId>false</appendAssemblyId>
               <finalName>${project.artifactId}-with-common-${project.version}</finalName>
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 01f26fa..3c722f4 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -91,6 +91,7 @@
                 <get
                   src="${hbase.tar}"
                   dest="${project.build.directory}/embedded/hbase.tar.gz"
+                  usetimestamp="true"
                   />
                 <untar
                   src="${project.build.directory}/embedded/hbase.tar.gz"
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 96eef65..dde339a 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -128,34 +128,6 @@
 
   <dependencies>
   </dependencies>
-  <profiles>
-    <profile>
-      <id>metrics2-standalone</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>ambari-metrics-common</module>
-        <module>ambari-metrics-hadoop-sink</module>
-        <module>ambari-metrics-flume-sink</module>
-        <module>ambari-metrics-storm-sink</module>
-        <module>ambari-metrics-host-monitoring</module>
-        <module>ambari-metrics-timelineservice</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>build-rpm</id>
-      <activation>
-        <property>
-          <name>build-rpm</name>
-        </property>
-      </activation>
-      <modules>
-        <module>ambari-metrics-assembly</module>
-      </modules>
-
-    </profile>
-  </profiles>
 
 
 </project>